Merge from mainline
authorPaul Eggert <eggert@cs.ucla.edu>
Sat, 5 Feb 2011 10:25:25 +0000 (02:25 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Sat, 5 Feb 2011 10:25:25 +0000 (02:25 -0800)
commit4b8111ebb92f1415adfa35963d2711cf30bf8cf6
tree01527161680caaa3152c0fd30802b163f0053d1c
parent3a95618897d248ad9fb0eb28843246ca1a92c780
parent2e630d967e8674dd6e2f1d37407b2cfdebe2e8f9
Merge from mainline